various tests: skip if temp directory lacks xattr support

Some autobuilder environments place the entire build chroot on tmpfs, so
even /var/tmp might not have this.

Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #232
Approved by: cgwalters

diff --git a/tests/libtest.sh b/tests/libtest.sh
index 06982d2173639e2d8f542909b1b40bbd402f2e3f..21de2e870d05fa963f3c9c8017736e3886e92db9 100755 (executable)
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -324,3 +324,11 @@ os_repository_new_commit ()
     ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit  --add-metadata-string "version=${version}" -b testos/buildmaster/x86_64-runtime -s "Build"
     cd ${test_tmpdir}
 }
+
+skip_without_user_xattrs () {
+    touch test-xattrs
+    if ! setfattr -n user.testvalue -v somevalue test-xattrs; then
+        echo "1..0 # SKIP this test requires xattr support"
+        exit 0
+    fi
+}

diff --git a/tests/test-basic-user.sh b/tests/test-basic-user.sh
index f53de89a7adc1e8994b529e3ed227db1079ad457..42e6a8648e4cd8655375de7f1258f16a7e284d96 100755 (executable)
--- a/tests/test-basic-user.sh
+++ b/tests/test-basic-user.sh
@@ -19,10 +19,12 @@
 
 set -euo pipefail
 
-echo "1..1"
-
 . $(dirname $0)/libtest.sh
 
+skip_without_user_xattrs
+
+echo "1..1"
+
 setup_test_repository "bare-user"
 echo "ok setup"
 

diff --git a/tests/test-delta.sh b/tests/test-delta.sh
index 12f54c7d23de792a759d96eebd6d05ff097e5b80..a6fd6f88bdbd9d008b8ab3543030f4cd1687bbd9 100755 (executable)
--- a/tests/test-delta.sh
+++ b/tests/test-delta.sh
@@ -21,6 +21,8 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
+skip_without_user_xattrs
+
 bindatafiles="bash true ostree"
 morebindatafiles="false ls"
 

diff --git a/tests/test-demo-buildsystem.sh b/tests/test-demo-buildsystem.sh
index 500eac6824a7602aeb064b5b3b4b06daac237f3c..bffa59c4382e6e44c6bc46d2d55c54415ebc0474 100755 (executable)
--- a/tests/test-demo-buildsystem.sh
+++ b/tests/test-demo-buildsystem.sh
@@ -26,6 +26,8 @@ fi
 
 . $(dirname $0)/libtest.sh
 
+skip_without_user_xattrs
+
 echo "1..1"
 
 # Run "triggers" like ldconfig, gtk-update-icon-cache, etc.

diff --git a/tests/test-local-pull.sh b/tests/test-local-pull.sh
index a9beb08388e3f1d2d2a6e75b1ee139609ef58418..50ecbcb71b061e95c9c22ebe8b4096e4ad27a3a9 100755 (executable)
--- a/tests/test-local-pull.sh
+++ b/tests/test-local-pull.sh
@@ -19,10 +19,12 @@
 
 set -euo pipefail
 
-echo "1..1"
-
 . $(dirname $0)/libtest.sh
 
+skip_without_user_xattrs
+
+echo "1..1"
+
 setup_test_repository "archive-z2"
 echo "ok setup"
 

diff --git a/tests/test-prune.sh b/tests/test-prune.sh
index 7184ea9c58190c0de2f1fbab1a698ffb600ca41b..e1796a33c65cc0684fab36b69dbdeec3c0aa7bdd 100755 (executable)
--- a/tests/test-prune.sh
+++ b/tests/test-prune.sh
@@ -21,6 +21,8 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
+skip_without_user_xattrs
+
 setup_fake_remote_repo1 "archive-z2"
 
 echo '1..2'

diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh
index 444fbce2e10dc67e7ed219a1c590ed85a6cc3f10..ba45959e0a23d4077fbd1420f4976e7fe6db97be 100755 (executable)
--- a/tests/test-rofiles-fuse.sh
+++ b/tests/test-rofiles-fuse.sh
@@ -25,6 +25,9 @@ if ! fusermount --version >/dev/null 2>&1; then
 fi
 
 . $(dirname $0)/libtest.sh
+
+skip_without_user_xattrs
+
 setup_test_repository "bare-user"
 
 echo "1..5"